Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 30, 2024

Otherwise CI prints validate.sh: 332: [[: not found and the line does nothing (but validate.sh continues to run), unless the system shell is ksh / bash / zsh. This may explain #10114 (comment).

Please read Github PR Conventions and then fill in one of these two templates.


Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions). —only indirectly

This is an automatic backport of pull request #10174 done by [Mergify](https://mergify.com).

@mergify
Copy link
Contributor Author

mergify bot commented Aug 30, 2024

Cherry-pick of 0b5cf15 has failed:

On branch mergify/bp/3.12/pr-10174
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 0b5cf151c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   validate.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Aug 30, 2024
@mergify mergify bot mentioned this pull request Aug 30, 2024
2 tasks
@mergify mergify bot added the backport label Aug 30, 2024
Otherwise CI prints `validate.sh: 332: [[: not found` and the line
does nothing (but `validate.sh` continues to run), unless the
system shell is `ksh` / `bash` / `zsh`. This may explain
#10114 (comment).

(cherry picked from commit 0b5cf15)
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-10174 branch from ce18e4b to 6e90cc9 Compare August 30, 2024 21:30
@geekosaur geekosaur closed this Sep 3, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-10174 branch September 3, 2024 03:06
@geekosaur geekosaur restored the mergify/bp/3.12/pr-10174 branch September 13, 2024 00:14
@geekosaur geekosaur reopened this Sep 13, 2024
@geekosaur
Copy link
Collaborator

Looks like this doesn't need to be backported, because merging the Windows fixes fixed it as a side effect.

@geekosaur geekosaur closed this Sep 13, 2024
@geekosaur geekosaur deleted the mergify/bp/3.12/pr-10174 branch September 13, 2024 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants